Skip to content

Conversation

lahinson
Copy link
Contributor

@lahinson lahinson commented Jul 17, 2025

@openshift-ci openshift-ci bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jul 17, 2025
@lahinson lahinson force-pushed the osdocs-15316-hcp-bm-improvements branch from a51c7f8 to 0c0d363 Compare July 17, 2025 17:00
@lahinson lahinson force-pushed the osdocs-15316-hcp-bm-improvements branch 2 times, most recently from 09a5173 to 4b08e25 Compare July 17, 2025 17:23
@lahinson lahinson force-pushed the osdocs-15316-hcp-bm-improvements branch 3 times, most recently from 73ffe57 to daa7c37 Compare July 17, 2025 19:39
@openshift-ci openshift-ci bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jul 17, 2025
@lahinson lahinson force-pushed the osdocs-15316-hcp-bm-improvements branch from daa7c37 to e5561df Compare July 17, 2025 19:57
@lahinson lahinson force-pushed the osdocs-15316-hcp-bm-improvements branch 6 times, most recently from aba8843 to 30573c3 Compare July 18, 2025 15:49
Copy link

@racedo racedo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add information about changing publishing strategy to recommended one for bare metal (load balancer) and explain it's not the default one

@LiangquanLi930
Copy link
Member

/lgtm

@lahinson lahinson force-pushed the osdocs-15316-hcp-bm-improvements branch from 5fc3a73 to 80665aa Compare August 27, 2025 13:15
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Aug 27, 2025
Copy link

openshift-ci bot commented Aug 27, 2025

New changes are detected. LGTM label has been removed.

@lahinson lahinson added the merge-review-needed Signifies that the merge review team needs to review this PR label Aug 27, 2025
@ShaunaDiaz ShaunaDiaz added merge-review-in-progress Signifies that the merge review team is reviewing this PR and removed merge-review-needed Signifies that the merge review team needs to review this PR labels Aug 28, 2025
@ShaunaDiaz
Copy link
Contributor

@lahinson My only Q on this was the use of "Hypershift Operator," which I thought we don't use in downstream docs. Otherwise LGTM after solving the merge conflict/rebasing.

@ShaunaDiaz ShaunaDiaz removed the merge-review-in-progress Signifies that the merge review team is reviewing this PR label Aug 28, 2025
@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 28, 2025
@lahinson lahinson force-pushed the osdocs-15316-hcp-bm-improvements branch from 80665aa to 5259c09 Compare August 28, 2025 13:33
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 28, 2025
Copy link

openshift-ci bot commented Aug 28, 2025

@lahinson: all tests passed!

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

@lahinson lahinson merged commit ff11687 into openshift:main Aug 28, 2025
2 checks passed
@lahinson
Copy link
Contributor Author

/cherrypick enterprise-4.17

@lahinson
Copy link
Contributor Author

/cherrypick enterprise-4.18

@lahinson
Copy link
Contributor Author

/cherrypick enterprise-4.19

@lahinson
Copy link
Contributor Author

/cherrypick enterprise-4.20

@openshift-cherrypick-robot

@lahinson: #96275 failed to apply on top of branch "enterprise-4.17":

Applying: Creating a hosted cluster on bare metal
.git/rebase-apply/patch:22: trailing whitespace.
You can create a hosted cluster or import one. When the Assisted Installer is enabled as an add-on to {mce-short} and you create a hosted cluster with the Agent platform, the HyperShift Operator installs the Agent Cluster API provider in the hosted control plane namespace. 
.git/rebase-apply/patch:69: trailing whitespace.
You can create a hosted cluster or import one. When the Assisted Installer is enabled as an add-on to {mce-short} and you create a hosted cluster with the Agent platform, the HyperShift Operator installs the Agent Cluster API provider in the hosted control plane namespace. 
.git/rebase-apply/patch:102: trailing whitespace.
The DNS entry can be as simple as a record that points to one of the nodes in the management cluster that is running the hosted control plane. The entry can also point to a load balancer that is deployed to redirect incoming traffic to the ingress pods. 
.git/rebase-apply/patch:156: trailing whitespace.
$ oc label node [compute-node-2] topology.kubernetes.io/zone=zone2 
.git/rebase-apply/patch:159: trailing whitespace.
[source,terminal] 
warning: squelched 1 whitespace error
warning: 6 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	hosted_control_planes/hcp-deploy/hcp-deploy-bm.adoc
M	hosted_control_planes/hcp-deploy/hcp-deploy-ibm-power.adoc
M	hosted_control_planes/hcp-deploy/hcp-deploy-ibmz.adoc
M	modules/hcp-bm-autoscale.adoc
M	modules/hcp-bm-hc.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/hcp-bm-hc.adoc
CONFLICT (content): Merge conflict in modules/hcp-bm-hc.adoc
Auto-merging modules/hcp-bm-autoscale.adoc
Auto-merging hosted_control_planes/hcp-deploy/hcp-deploy-ibmz.adoc
CONFLICT (content): Merge conflict in hosted_control_planes/hcp-deploy/hcp-deploy-ibmz.adoc
Auto-merging hosted_control_planes/hcp-deploy/hcp-deploy-ibm-power.adoc
CONFLICT (content): Merge conflict in hosted_control_planes/hcp-deploy/hcp-deploy-ibm-power.adoc
Auto-merging hosted_control_planes/hcp-deploy/hcp-deploy-bm.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Creating a hosted cluster on bare metal

In response to this:

/cherrypick enterprise-4.17

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@openshift-cherrypick-robot

@lahinson: #96275 failed to apply on top of branch "enterprise-4.18":

Applying: Creating a hosted cluster on bare metal
.git/rebase-apply/patch:22: trailing whitespace.
You can create a hosted cluster or import one. When the Assisted Installer is enabled as an add-on to {mce-short} and you create a hosted cluster with the Agent platform, the HyperShift Operator installs the Agent Cluster API provider in the hosted control plane namespace. 
.git/rebase-apply/patch:69: trailing whitespace.
You can create a hosted cluster or import one. When the Assisted Installer is enabled as an add-on to {mce-short} and you create a hosted cluster with the Agent platform, the HyperShift Operator installs the Agent Cluster API provider in the hosted control plane namespace. 
.git/rebase-apply/patch:102: trailing whitespace.
The DNS entry can be as simple as a record that points to one of the nodes in the management cluster that is running the hosted control plane. The entry can also point to a load balancer that is deployed to redirect incoming traffic to the ingress pods. 
.git/rebase-apply/patch:156: trailing whitespace.
$ oc label node [compute-node-2] topology.kubernetes.io/zone=zone2 
.git/rebase-apply/patch:159: trailing whitespace.
[source,terminal] 
warning: squelched 1 whitespace error
warning: 6 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	hosted_control_planes/hcp-deploy/hcp-deploy-bm.adoc
M	hosted_control_planes/hcp-deploy/hcp-deploy-ibm-power.adoc
M	hosted_control_planes/hcp-deploy/hcp-deploy-ibmz.adoc
M	modules/hcp-bm-hc.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/hcp-bm-hc.adoc
CONFLICT (content): Merge conflict in modules/hcp-bm-hc.adoc
Auto-merging hosted_control_planes/hcp-deploy/hcp-deploy-ibmz.adoc
CONFLICT (content): Merge conflict in hosted_control_planes/hcp-deploy/hcp-deploy-ibmz.adoc
Auto-merging hosted_control_planes/hcp-deploy/hcp-deploy-ibm-power.adoc
Auto-merging hosted_control_planes/hcp-deploy/hcp-deploy-bm.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Creating a hosted cluster on bare metal

In response to this:

/cherrypick enterprise-4.18

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@openshift-cherrypick-robot

@lahinson: new pull request created: #98161

In response to this:

/cherrypick enterprise-4.19

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@openshift-cherrypick-robot

@lahinson: new pull request created: #98162

In response to this:

/cherrypick enterprise-4.20

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants